Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoMerge][Main] Merging staged change(s) to main #197

Merged

Conversation

opentelemetrybot
Copy link
Contributor

staging @ 42d1cfc...

Moving package from auto-merge/js/api to pkgs/api/

Moving package from auto-merge/js/packages/opentelemetry-semantic-conventions/ to pkgs/semantic-conventions/

Moving package from auto-merge/js/packages/opentelemetry-core/ to pkgs/core/

Moving package from auto-merge/js/packages/opentelemetry-resources/ to pkgs/resources/

Moving package from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/ to pkgs/context/zone-peer-dep/

Moving package from auto-merge/js/packages/opentelemetry-context-zone/ to pkgs/context/zone/

Moving package from auto-merge/js/packages/opentelemetry-propagator-b3/ to pkgs/propagators/b3/

Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-base/ to pkgs/sdk/trace/base/

Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-web/ to pkgs/sdk/trace/web/

Moving package from auto-merge/js/packages/sdk-metrics/ to pkgs/sdk/metrics/

Moving package from auto-merge/js/experimental/packages/sdk-logs/ to pkgs/sdk/logs/

Moving package from auto-merge/js/experimental/packages/otlp-exporter-base to pkgs/exporters/otlp/base/

Moving package from auto-merge/js/experimental/packages/otlp-transformer to pkgs/exporters/otlp/transformer

Moving package from auto-merge/js/experimental/packages/otlp-proto-exporter-base to pkgs/exporters/otlp/proto-base

Moving package from auto-merge/js/packages/opentelemetry-exporter-zipkin/ to pkgs/exporters/zipkin/

Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-proto to pkgs/exporters/otlp/trace/proto/

Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-http to pkgs/exporters/otlp/trace/http/

Moving package from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http to pkgs/exporters/otlp/metrics/http/

Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-proto to pkgs/exporters/otlp/logs/proto/

Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-http to pkgs/exporters/otlp/logs/http/

Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation/ to pkgs/instrumentations/instrumentation/

Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/ to pkgs/instrumentations/web/fetch

Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/ to pkgs/instrumentations/web/xhr

Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/ to pkgs/instrumentations/web/document-load/

Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/ to pkgs/instrumentations/web/user-interaction/

Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/ to pkgs/instrumentations/web/long-task/

Moving package from auto-merge/contrib/metapackages/auto-instrumentations-web/ to pkgs/instrumentations/web/auto/

Moving package from auto-merge/js/experimental/packages/opentelemetry-browser-detector/ to pkgs/detectors/browser/

Moving package from auto-merge/js/experimental/packages/api-logs/ to pkgs/api-logs/

Moving package from auto-merge/js/experimental/packages/api-events/ to pkgs/api-events/

Moving package from auto-merge/js/examples/opentelemetry-web/ to examples/web/js/

Merge Staged changes to main

Auto resolving 23 conflicts to select the master repo version

Summary of changes by file state
DD (Deleted <=> Deleted): 11
AA (Added <=> Added): 12

  • (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/api/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/experimental/packages/api-events/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/api-events/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/experimental/packages/api-logs/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintrc.js - Removed from both
  • (DD) auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.esm.json - Removed from both
  • (DD) auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js - Removed from both
  • (AA) pkgs/api-events/.eslintrc.js - Added in both => checkout theirs
  • (AA) pkgs/api-logs/.eslintrc.js - Added in both => checkout theirs
  • (AA) pkgs/api-logs/tsconfig.esm.json - Added in both => checkout theirs
  • (AA) pkgs/api/tsconfig.esm.json - Added in both => checkout theirs
  • (AA) pkgs/context/zone-peer-dep/tsconfig.esm.json - Added in both => checkout theirs
  • (AA) pkgs/core/tsconfig.esm.json - Added in both => checkout theirs
  • (AA) pkgs/detectors/browser/tsconfig.esm.json - Added in both => checkout theirs
  • (AA) pkgs/exporters/otlp/metrics/http/.eslintrc.js - Added in both => checkout theirs
  • (AA) pkgs/exporters/otlp/trace/http/.eslintrc.js - Added in both => checkout theirs
  • (AA) pkgs/exporters/otlp/trace/proto/.eslintrc.js - Added in both => checkout theirs
  • (AA) pkgs/instrumentations/web/auto/.eslintrc.js - Added in both => checkout theirs
    ...truncated...
    Identifying and fixing merge issues from staged repos

martinkuba and others added 25 commits September 29, 2023 06:45
Co-authored-by: Tyler Benson <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
…hed (#3958)

* fix: BathExporter should export continuously when batch size is reached

* fix: add tests

* lintfix

* add changelog

* add test for concurrency

* Update CHANGELOG.md

* Apply suggestions from code review

* Lint and fix browser tests

* fix: lint

---------

Co-authored-by: Daniel Dyla <[email protected]>
Co-authored-by: Marc Pichler <[email protected]>
…multi/MULTI if they exist (#1729)

Co-authored-by: Marc Pichler <[email protected]>
…metry-js@b6e532b)

  - commit b6e532b
  - Author: Chengzhong Wu <[email protected]>
  - Date:   Wed Oct 11 16:05:03 2023 +0800
  -     feat(metrics): prototype experimental advice support (#3876)
  - ...
### Auto resolving 4 conflicts to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 2
UD (Updated <=> Deleted): 2

 - (UA) auto-merge/js/.github/workflows/benchmark.yml - Unmerged, added by them => checkout theirs
 - (UA) auto-merge/js/doc/contributing/benchmark-tests.md - Unmerged, added by them => checkout theirs
 - (UD) auto-merge/js/doc/library-author.md - Unmerged, deleted by them => remove
 - (UD) auto-merge/js/doc/processor-api.md - Unmerged, deleted by them => remove
…opentelemetry-js-contrib@659d7ba)

  - commit 659d7ba
  - Author: Daniel Dyla <[email protected]>
  - Date:   Mon Oct 16 07:50:22 2023 -0400
  -     chore: release main (#1737)
  - ...
### Auto resolving 1 conflict to select the master repo version
Summary of changes by file state
UA (Updated <=> Added): 1

 - (UA) auto-merge/contrib/plugins/node/opentelemetry-instrumentation-fastify/.tav.yml - Unmerged, added by them => checkout theirs
…etrybot/auto-merge-repo-staging

[AutoMerge][Staging] Merging change(s) from otel-js; otel-js-contrib;
### Moving package from auto-merge/js/api to pkgs/api/
### Moving package from auto-merge/js/packages/opentelemetry-semantic-conventions/ to pkgs/semantic-conventions/
### Moving package from auto-merge/js/packages/opentelemetry-core/ to pkgs/core/
### Moving package from auto-merge/js/packages/opentelemetry-resources/ to pkgs/resources/
### Moving package from auto-merge/js/packages/opentelemetry-context-zone-peer-dep/ to pkgs/context/zone-peer-dep/
### Moving package from auto-merge/js/packages/opentelemetry-context-zone/ to pkgs/context/zone/
### Moving package from auto-merge/js/packages/opentelemetry-propagator-b3/ to pkgs/propagators/b3/
### Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-base/ to pkgs/sdk/trace/base/
### Moving package from auto-merge/js/packages/opentelemetry-sdk-trace-web/ to pkgs/sdk/trace/web/
### Moving package from auto-merge/js/packages/sdk-metrics/ to pkgs/sdk/metrics/
### Moving package from auto-merge/js/experimental/packages/sdk-logs/ to pkgs/sdk/logs/
### Moving package from auto-merge/js/experimental/packages/otlp-exporter-base to pkgs/exporters/otlp/base/
### Moving package from auto-merge/js/experimental/packages/otlp-transformer to pkgs/exporters/otlp/transformer
### Moving package from auto-merge/js/experimental/packages/otlp-proto-exporter-base to pkgs/exporters/otlp/proto-base
### Moving package from auto-merge/js/packages/opentelemetry-exporter-zipkin/ to pkgs/exporters/zipkin/
### Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-proto to pkgs/exporters/otlp/trace/proto/
### Moving package from auto-merge/js/experimental/packages/exporter-trace-otlp-http to pkgs/exporters/otlp/trace/http/
### Moving package from auto-merge/js/experimental/packages/opentelemetry-exporter-metrics-otlp-http to pkgs/exporters/otlp/metrics/http/
### Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-proto to pkgs/exporters/otlp/logs/proto/
### Moving package from auto-merge/js/experimental/packages/exporter-logs-otlp-http to pkgs/exporters/otlp/logs/http/
### Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation/ to pkgs/instrumentations/instrumentation/
### Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-fetch/ to pkgs/instrumentations/web/fetch
### Moving package from auto-merge/js/experimental/packages/opentelemetry-instrumentation-xml-http-request/ to pkgs/instrumentations/web/xhr
### Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/ to pkgs/instrumentations/web/document-load/
### Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-user-interaction/ to pkgs/instrumentations/web/user-interaction/
### Moving package from auto-merge/contrib/plugins/web/opentelemetry-instrumentation-long-task/ to pkgs/instrumentations/web/long-task/
### Moving package from auto-merge/contrib/metapackages/auto-instrumentations-web/ to pkgs/instrumentations/web/auto/
### Moving package from auto-merge/js/experimental/packages/opentelemetry-browser-detector/ to pkgs/detectors/browser/
### Moving package from auto-merge/js/experimental/packages/api-logs/ to pkgs/api-logs/
### Moving package from auto-merge/js/experimental/packages/api-events/ to pkgs/api-events/
### Moving package from auto-merge/js/examples/opentelemetry-web/ to examples/web/js/
### Auto resolving 23 conflicts to select the master repo version
Summary of changes by file state
DD (Deleted <=> Deleted): 11
AA (Added <=> Added): 12

 - (DD) auto-merge/contrib/plugins/web/opentelemetry-instrumentation-document-load/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/api/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/experimental/packages/api-events/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/api-events/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/experimental/packages/api-logs/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/exporter-trace-otlp-proto/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/opentelemetry-browser-detector/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/experimental/packages/opentelemetry-instrumentation/.eslintrc.js - Removed from both
 - (DD) auto-merge/js/packages/opentelemetry-context-zone-peer-dep/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/packages/opentelemetry-propagator-b3/tsconfig.esm.json - Removed from both
 - (DD) auto-merge/js/packages/opentelemetry-semantic-conventions/.eslintrc.js - Removed from both
 - (AA) pkgs/api-events/.eslintrc.js - Added in both => checkout theirs
 - (AA) pkgs/api-logs/.eslintrc.js - Added in both => checkout theirs
 - (AA) pkgs/api-logs/tsconfig.esm.json - Added in both => checkout theirs
 - (AA) pkgs/api/tsconfig.esm.json - Added in both => checkout theirs
 - (AA) pkgs/context/zone-peer-dep/tsconfig.esm.json - Added in both => checkout theirs
 - (AA) pkgs/core/tsconfig.esm.json - Added in both => checkout theirs
 - (AA) pkgs/detectors/browser/tsconfig.esm.json - Added in both => checkout theirs
 - (AA) pkgs/exporters/otlp/metrics/http/.eslintrc.js - Added in both => checkout theirs
 - (AA) pkgs/exporters/otlp/trace/http/.eslintrc.js - Added in both => checkout theirs
 - (AA) pkgs/exporters/otlp/trace/proto/.eslintrc.js - Added in both => checkout theirs
 - (AA) pkgs/instrumentations/web/auto/.eslintrc.js - Added in both => checkout theirs
...truncated...
Identifying and fixing merge issues from staged repos
@MSNev MSNev merged commit 97f33e1 into open-telemetry:main Oct 16, 2023
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

10 participants